Add GtkStyleProvider, an interface to provide style details.

The get_style() function isn't final yet, further parameters
should be added to query details based on the widget hierarchy,
name, etc.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index dc29a1e52b20815bbaec4fbb0243297a1ad2cf27..8b607f8d1c22db9ba5d1ff4eca0d79548fd39f92 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -291,6 +291,7 @@ gtk_public_h_sources =          \
        gtkstatusbar.h          \
        gtkstatusicon.h         \
        gtkstock.h              \
+       gtkstyleprovider.h      \
        gtkstyleset.h           \
        gtkstyle.h              \
        gtkswitch.h             \
@@ -588,6 +589,7 @@ gtk_base_c_sources =            \
        gtkstatusbar.c          \
        gtkstatusicon.c         \
        gtkstock.c              \
+       gtkstyleprovider.c      \
        gtkstyleset.c           \
        gtkstyle.c              \
        gtkswitch.c             \

diff --git a/gtk/gtk.h b/gtk/gtk.h
index 711527577a3f301172c7366293c3d5345a50d2c0..15c411f22a8cc4b1d50f01108d275ff63919fe08 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -174,6 +174,7 @@
 #include <gtk/gtkstatusbar.h>
 #include <gtk/gtkstatusicon.h>
 #include <gtk/gtkstock.h>
+#include <gtk/gtkstyleprovider.h>
 #include <gtk/gtkstyleset.h>
 #include <gtk/gtkstyle.h>
 #include <gtk/gtkswitch.h>

diff --git a/gtk/gtkstyleprovider.c b/gtk/gtkstyleprovider.c
new file mode 100644 (file)
index 0000000..18cca7b
--- /dev/null
+++ b/gtk/gtkstyleprovider.c
@@ -0,0 +1,66 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2010 Carlos Garnacho <carlosg@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include "gtkprivate.h"
+#include "gtkstyleprovider.h"
+#include "gtkintl.h"
+
+#include "gtkalias.h"
+
+static void gtk_style_provider_iface_init (gpointer g_iface);
+
+GType
+gtk_style_provider_get_type (void)
+{
+  static GType style_provider_type = 0;
+
+  if (!style_provider_type)
+    style_provider_type = g_type_register_static_simple (G_TYPE_INTERFACE,
+                                                         I_("GtkStyleProvider"),
+                                                         sizeof (GtkStyleProviderIface),
+                                                         (GClassInitFunc) gtk_style_provider_iface_init,
+                                                         0, NULL, 0);
+  return style_provider_type;
+}
+
+static void
+gtk_style_provider_iface_init (gpointer g_iface)
+{
+  GType iface_type = G_TYPE_FROM_INTERFACE (g_iface);
+}
+
+GtkStyleSet *
+gtk_style_provider_get_style (GtkStyleProvider *provider)
+{
+  GtkStyleProviderIface *iface;
+
+  g_return_val_if_fail (GTK_IS_STYLE_PROVIDER (provider), NULL);
+
+  iface = GTK_STYLE_PROVIDER_GET_IFACE (provider);
+
+  if (!iface->get_style)
+    return NULL;
+
+  return iface->get_style (provider);
+}
+
+#define __GTK_STYLE_PROVIDER_C__
+#include "gtkaliasdef.c"

diff --git a/gtk/gtkstyleprovider.h b/gtk/gtkstyleprovider.h
new file mode 100644 (file)
index 0000000..ec5ee99
--- /dev/null
+++ b/gtk/gtkstyleprovider.h
@@ -0,0 +1,58 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2010 Carlos Garnacho <carlosg@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_STYLE_PROVIDER_H__
+#define __GTK_STYLE_PROVIDER_H__
+
+#include <glib-object.h>
+#include "gtkstyleset.h"
+#include "gtkenums.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_STYLE_PROVIDER          (gtk_style_provider_get_type ())
+#define GTK_STYLE_PROVIDER(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider))
+#define GTK_IS_STYLE_PROVIDER(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_STYLE_PROVIDER))
+#define GTK_STYLE_PROVIDER_GET_IFACE(o)  (G_TYPE_INSTANCE_GET_INTERFACE ((o), GTK_TYPE_STYLE_PROVIDER, GtkStyleProviderIface))
+
+typedef struct GtkStyleProviderIface GtkStyleProviderIface;
+typedef struct GtkStyleProvider GtkStyleProvider; /* dummy typedef */
+
+typedef enum {
+  GTK_SELECTOR_TYPE_PATH,
+  GTK_SELECTOR_TYPE_NAME,
+  GTK_SELECTOR_TYPE_CLASS_PATH,
+  GTK_SELECTOR_TYPE_CLASS_NAME
+} GtkSelectorType;
+
+struct GtkStyleProviderIface
+{
+  GTypeInterface g_iface;
+
+  GtkStyleSet * (* get_style) (GtkStyleProvider *provider);
+};
+
+GType gtk_style_provider_get_type (void) G_GNUC_CONST;
+
+GtkStyleSet *gtk_style_provider_get_style (GtkStyleProvider *provider);
+
+
+G_END_DECLS
+
+#endif /* __GTK_STYLE_PROVIDER_H__ */